From e93b1105e06a38f1eee37cf1ddffdd35600657f7 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Fri, 27 Sep 2002 00:43:40 +0000 Subject: [PATCH] (try_font_list): Pay attention to the case that FAMILY is nil. --- src/xfaces.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xfaces.c b/src/xfaces.c index 57749ea5634..d5ddd6b40de 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -6343,7 +6343,7 @@ try_font_list (f, attrs, family, registry, fonts, prefer_face_family) Lisp_Object face_family = attrs[LFACE_FAMILY_INDEX]; Lisp_Object try_family; - try_family = prefer_face_family ? face_family : family; + try_family = (prefer_face_family || NILP (family)) ? face_family : family; if (STRINGP (try_family)) nfonts = try_alternative_families (f, try_family, registry, fonts); @@ -6359,7 +6359,7 @@ try_font_list (f, attrs, family, registry, fonts, prefer_face_family) nfonts = try_alternative_families (f, try_family, Qnil, fonts); #endif - if (! prefer_face_family) + if (EQ (try_family, family)) family = face_family; if (nfonts == 0 && STRINGP (family)) -- 2.30.2